rewrite comment removal code
Merge pull request #1 from kallisti-dev/master

rewrite of comment removal code