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

generated from commit af846a546d22b47ab311870dcf6062b9e0a6fe81