eddelbuettel Merge pull request #1 from joe-skb7/master