pull request from zcmoore/master