Deployed: Merge pull request #220 from masondesu/eric

generated from commit b9cea5c207db9f8b88607a22b15a79a3cc4dc7e7