Merge pull request #61 from UweBonnes/master