Staging 2.1.20
Update README.md
fixes for #83 and #65
Update README.md
couple of changes based on feedback
merging staging branch into master