Merge pull request #1 from ConnyOnny/master