updates #6: Comments fix
Merge branch 'issue-6' into develop