Several small changes in implementation around the library; no real API
changes I don't think.
fuller README
Merge branch 'master' into develop