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

generated from commit a28642d169d9f016905202ed888bf119cf7a0e9e