Minor fixes & docs
resolve merge conflict in readme
Merge pull request #16 from nickb1080/patch

Patch