Merge pull request #9 from visigoth/master