Deployed: Merge pull request #212 from masondesu/eric

generated from commit d12d75aa4761d67bf9d90b0ada18b075fa4db9b8