Merge pull request #1 from paul-christmann/master

Testing Cleanup