merged
Merge pull request #98 from tiger-swallowtails-2014/json_update_experimentation

merged