Merge pull request #56 from BrassGoggledCoders/master

Master > Nightly
Merge pull request #57 from BrassGoggledCoders/nightly

Using Master for readding