added comment styles
Merge branch 'develop'