Merge pull request #22 from jp90/JP

Jp