Fixes #47
Merge branch 'fixes/comments' into develop