Merge pull request #4 from nealcpeters/testing

Testing
Merge branch 'master' into testing