Deployed: Merge pull request #170 from masondesu/eric

generated from commit bd808d0b1f50543b3fe6c47a73fb58e3f820d3f9