Deployed: Merge pull request #185 from masondesu/joe-fixes

generated from commit 32d67b3143d75d54daf6a1be838f980ca95847a0