Merge pull request #33 from m6w6/fix-19