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

generated from commit 5e84ce7d2ee1ab462c58df3afe28afb6e318a3e7