Merge pull request #3 from m4b/master

implemented the todo for single comments, strings no longer escape the c...
Added TODO comment to single line comments
merged origin/master with upstream/master (it was the todo causing the conflict);