Deployed: Merge pull request #226 from masondesu/eric

generated from commit 0a8066cf76dd947b8e495ee3e9cd000d16d583c9