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

generated from commit b7aabf70f24a8fccaad7841cc374e782bc5dd82e