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

generated from commit 0ad9435bff8bb6137fe217a0c6ec512d3f0c859e