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

generated from commit b6322e54eb852872c10ebd014620a13973815947