Fixed bug #77 for comments
Fix for bug #77 for answers
Merge branch 'master' into staging