Merge branch 'release/0.3.1'
fixed test case for previous release (sorry)
Fixed an obvious bug in Json helper
Better Client test coverage