Refactor to use json
Merge pull request #1 from longnguyen11288/master

Refactor to use json