Merge pull request #585 from dcherman/master