Deployed: Merge pull request #174 from masondesu/eric

generated from commit 2265a7f4685ab531fa56647abda49582a23a3f34