Deployed: Merge pull request #73 from masondesu/to-do

generated from commit 6b5196229fcbe351661d180f869868d408143d0e