Added support for comments
Merge branch 'master' of https://github.com/emravera/puma