Merge pull request #1 from dmccammon/master

Create test
Merge pull request #2 from dmccammon/testBranch

Merge pull request #1 from dmccammon/master