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

generated from commit 56bef78800e1f4c23922f7bcbe0b348230b5ce0f