committing on testing branch
Merge pull request #1 from jeffbrl/testing

committing on testing branch