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

generated from commit 27cc240d786f153e06ba876fd013dc94de3339d1