Merge pull request #13 from BrassGoggledCoders/master

Stuff