Merge pull request #1 from cbunting99/master

Update
Merge pull request #6 from vanasis/master

Merge pull request #1 from cbunting99/master