Undefined Variable Cleanup
Merge pull request #1104 from icomrade/master

Undefined Variable Cleanup