changes
Merge pull request #2 from calthom/testMaster

changes