Merge pull request #51 from Neeke/master