Merge pull request #1 from eddelbuettel/master

avoid some compiler warnings, and a cleanup