Merge pull request #1 from rheit/master

Merge branch testing