Merge pull request #10 from mwichmann/master

more fixes
strip comments earlier, fixes some problems