Merge pull request #497 from TheDZD/master

Misc. Fixes and Changes