pull request from jimweirich:master