Deployed: Merge pull request #162 from masondesu/eric

generated from commit d24673f8efe166e417aa150888b036f668d1c091