Merge pull request #3 from PistolBear/master

Merging work with master
Merge pull request #4 from PistolBear/Work

Merge pull request #3 from PistolBear/master