Merge pull request #1 from daniel-hopkins/master

Update my fork with all changes to date