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

generated from commit 53e9b148f9882e9d30fd58aaadd1272460cac8e7