adding support for comments
Merge branch 'master' of github.com:TeamFauna/dumbo