Changes in comment shortcut. Fixes #2