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

generated from commit 9e8b5f34923f11675bc2ad0f9a2c69ba611343e5