add ability to change values with key/value tags other than Key and Value
Merge remote-tracking branch 'origin/master'