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

generated from commit 1d32df8ba0f29a63de69f707ecb57f2cf54e6070