Merge pull request #3 from hungpham/master

Hey, please merge this version
update json

update json
Merge pull request #17 from johnsonpham/master

update json