more testing
Merge pull request #1 from olear/branch1

more testing