Deployed: Merge pull request #140 from masondesu/eric-fix-branch

generated from commit 9107a7b36dacbf0a61fc761c1a6f48abbf630b2a