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

generated from commit de2a92d63414fc61981698eb90b6e636cb8c4704