Merge pull request #8 from jp90/Dave

Dave
Merge pull request #9 from jp90/JP

Jp
Merge pull request #13 from jp90/master

update