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

generated from commit ad9ee36fdc3ad2cab46d6a3e4b6f279eaa2d3ddd