Deployed: Merge pull request #207 from masondesu/eric

generated from commit 151053f6e288fb59c3e965f2f89c068833456ca3