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

generated from commit 5e398580ed17a0dce7b9b80102f0573de3d8f02b