fix comment api bug - Fixes #35
Merge branch 'fix-comments' into develop
Merge branch 'develop'