Deployed: Merge pull request #193 from masondesu/eric

generated from commit f546bcd0d95a885372e47c4176aeb51cf3d40f29