Merge pull request #4 from ConnyOnny/master