Deployed: Merge pull request #216 from masondesu/eric

generated from commit e92f266506e3fc9c3694883a6e58e4326538090b