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

generated from commit 7ab9a4b9d9bbb7837a8fd66ac6c5988e919cc4fa