Merge pull request #1 from jonBarcus/master

updated test
Merge pull request #2 from jonBarcus/develop

Merge pull request #1 from jonBarcus/master