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

generated from commit 8d4848e84f48f07c844b7ebd44178b9ba5583c5d