Remove comments
Merge remote-tracking branch 'origin/Issue13'