Resolved recent merge conflicts
Merge pull request #23 from leekelleher/cgrt13-forum-comments-fix-2

Resolved recent merge conflicts