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

generated from commit 874f43b40081a9fde4f69bedd3b873e1445ed82e