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

generated from commit 80c81214a10988cf103ba41143d174fa34c4df6a