Merge pull request #712 from tas50/master