Merge pull request #7 from PistolBear/master

Updating Work
Merge pull request #8 from PistolBear/Work

Merge pull request #7 from PistolBear/master