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

generated from commit 1d7102c8f64d8e2cc5869641b2f9c3e010f8dc0f