add comment support
Merge pull request #34 from xduo/staging

Add comment support