Merge pull request #3 from visigoth/master