pending fix
Merge pull request #2 from pakiran/comments

[WIP] fix & test