Merge comments, closes #14
Merge pull request #18 from npolar/merge_comments

Merge comments, closes #14