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