Add key-value parsing, no error checking
Merge remote-tracking branch 'origin/master'