Merge pull request #2 from jp90/master

Merge pull request #1 from jp90/Dave
Merge pull request #3 from jp90/Dave

Merge pull request #2 from jp90/master