Merge pull request #1 from KarlNosworthy/master

Update to Head of Master