Merge pull request #587 from jbondpdx/master