eddelbuettel Merge pull request #314 from m-legrand/patch-1