Fixed bug in comments handling
Merge branch 'release/v0.7.x'