Deployed: Merge pull request #153 from masondesu/marty-fix

generated from commit 673d86100262d60849d01260e525287ca904da99