Deployed: Merge pull request #224 from masondesu/eric

generated from commit 2a372b134fcf95d2f637d7e979fdae1ac97b84cd