vbraun Merge pull request #21 from fchapoton/patch-1