Modification for better key/value handling.
Merge branch 'master' of github.com:dothiv/dothiv