Merge pull request #2 from matthewmfarmer/master

Pull request
Merge pull request #3 from matthewmfarmer/matt

Merge pull request #2 from matthewmfarmer/master