Merge pull request #2 from matthewmfarmer/master

Pull request