Improved JSON serialization
Merge pull request #9 from chancancode/better_json

Improved JSON serialization