Merge pull request #1 from stuyfission/master

Update