Preliminary work on comments
Merge pull request #144 from thriuin/master

Preliminary work for comments