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

generated from commit f4b4afd0f18fc7fb582c141f3e2b8a8455a842a7