Feature #60, refactored comment validator
Merge branch 'feature-60' into develop