Added support for comments in keyvalue files