Fix bug sort comment - Fixes #30
Merge branch 'sort_comments' into develop