fix bug with comments
Merge branch 'master' into theradiocc