#110 Solving Bug where comments were hidden
Merge remote-tracking branch 'origin/master'