Fixed JSON Unmarshalling
Bumping version number
Merge branch 'release/1.0'