Issue7 comment option

Related to #7