Merge pull request #1 from jersme/branch1

Merged test file out of branch 1 to master