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

generated from commit 0a427c1d3bfbfd388664aad146abeaefa85caca5