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

generated from commit 43197821b2df3fa916213c0aa7b8275df0ddc6e7