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

generated from commit 9db7db09c576730fa0ce5083354fac6d2d3bd61c