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

generated from commit 55ff8f5547a6acfca773e9205972e9586b2f7774