Merge pull request #2 from wheals/master