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

generated from commit c91a57b1cefe6277ee1719f1629e608ddde0c692