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

generated from commit 9ba0697987a66e4738544bd3629e161ecc5e17de