fix for Issue #99
Fix comment management
Merge pull request #112 from speelgoedkoper/master

Fix for Issue #99
Merge branch 'sonata/master'