Deployed: Merge pull request #202 from masondesu/eric

generated from commit 036357487f144ad257133f1574e81f472b0577d3