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

generated from commit 56040e06750ba5ed5e59c7f6c4e19041a1d338cf