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

generated from commit 6b6a54f83534483a0a1288888e05404727782d84