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

generated from commit 4155871d95cd0c66f3cb3b8616fb838b3bebf469