Fixes as per #4
Fixes as per #5
Modify README.md
Merge branch 'master' into development