Deployed: Merge pull request #208 from masondesu/joe-quick-fix

generated from commit 52d6c19f0120c590ae5b5ab1eb6d070646b3fc96