Almost missed this one… glad I went back the thread! :)

I think it would be simpler to allow only line comments. Trailing comments in key-value line will likely screw up things as you mentioned. 

And unit tests are definitely needed for QA! I just don't have enough time to write all those… help needed! :D