Merge pull request #1 from matthew-p/master

Master
Merge pull request #2 from matthew-p/p2

Merge pull request #1 from matthew-p/master