Merge pull request #35 from UweBonnes/master