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

generated from commit 65c643db2cf391aab0d1fbfe6bcb1aa2f832f344