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

generated from commit d30199bd2f30a86b05b9e144e370cfb314eb5a86