Merge pull request #615 from nealef/master