Merge pull request #3 from distee/master