Deployed: Merge pull request #225 from masondesu/eric

generated from commit 16d332316608ccaa4bccc4648f9d5dd3442689d8