Merge pull request #22 from jp90/JP

Jp
Merge pull request #23 from jp90/master

Merge pull request #22 from jp90/JP