Comments and max-columns
Merge pull request #2 from Brobin/develop

Comments and max-columns