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

generated from commit b6926b011124ed0f1b2f22dba7880f90401a6225