Merge pull request #78 from birjolaxew/master

Fixes for #76 and #77, updated README.md