Deployed: Merge pull request #135 from twhitacre/master

generated from commit def00fbc7f7cc0e86d15bac95fd7af95ff86c445