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

generated from commit cc4c3e2746c65dfcb9905e2b967a21cf7cf9e058