Merge pull request #7 from pepoc/master

update
Merge pull request #12 from resJson/master

Merge pull request #7 from pepoc/master