Deployed: Merge pull request #172 from masondesu/eric

generated from commit 06a2c70a1c8ae3d3bf2c6287a9d55bbf2bb01770