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

generated from commit 1343d2c446a9bdcf21a1b263cb53006a03f490d5