Merge pull request #3 from PistolBear/master

Merging work with master