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

generated from commit 3b137a273cdb03537f665db7e83503159e8fd433