Merge pull request #52 from UweBonnes/master