Fix #150
Improved comments of codebase
Update README.md
Merge pull request #159 from giuscri/#150

Fix #150