Merge pull request #1 from jedelman8/master

Update to latest