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

generated from commit 022ad0a79b9884b2c56d58aa6701c1cb7030bed9