Merge pull request #1 from cbunting99/master

Update