Merge pull request from adelman1/master