Merge pull request #49 from UweBonnes/master