Merge pull request #1 from devongovett/master

Update from original
fix comment shortcut
Merge pull request #15 from luisfontes/master

fixes comment shortcut