Merge pull request #1 from woutervanwijk/master

changes for 0.5.1 beta