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

generated from commit 9d1baf2832b9e47467a4b783764865c74a7d2e09