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

generated from commit 968b427643fd362896b721a28d39039e6283f267