Merge pull request #22 from cfwheels/master

pull from upstream
repair missing json encoding
Merge pull request #255 from scahyono/master-json-encoding-fix

Master json encoding fix