Merge pull request #648 from reinert/master