Deployed: Merge pull request #217 from masondesu/eric

generated from commit 5c2fb1b3ed8cf17e49fdaab9076aef146b78226e