Deployed: Merge pull request #173 from masondesu/eric

generated from commit 0d21ef45b55d99375346943ff4d7ed52f7d54080