Added support for comments
Rebased
Merge pull request #5 from longnguyen11288/master

Added comments support