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

generated from commit 6173a3d649e67306a48e1c1e8b7fa18a4aba2b18