Merge pull request #31 from jonathanchrisp/staging

Merge of staging into master
Added multi_json as a runtime dependancy
Merge pull request #33 from jonathanchrisp/multi-json-runtime-dependancy

Added multi_json as a runtime dependancy