Small cleanup using static analysis
Update version number to 2.0.
Update README.md
Update README.md
Merge pull request #386 from HairyFotr/patch-4

Small cleanup using static analysis