strip comments earlier, fixes some problems
Merge pull request #11 from mwichmann/master

strip comments earlier, fixes some problems