Merge pull request #1 from Brobin/develop

Merge Develop to master
Update readme.md
Merge pull request #2 from Brobin/develop

Comments and max-columns