Merge pull request #1 from Bigjoos/master

Misc Updates