Merge pull request #1 from TheChildWalrus/master

Update fork