Merge pull request #38 from jimsch/master

Testing Cleanup work