Merge pull request #83 from coien/master

Thanks for the fixes.