Merge pull request #13 from BrassGoggledCoders/master

Stuff
Merge pull request #14 from BrassGoggledCoders/nightly

Merge pull request #13 from BrassGoggledCoders/master