Merge pull request #6 from pepoc/master

#6
Merge pull request #11 from resJson/master

Merge pull request #6 from pepoc/master