Deployed: Merge pull request #115 from masondesu/eric-fix-branch

generated from commit 4cd55e3246d135bab3afec5c73b66397852b6ee7