Cherry-picked commits lost in a complicated merge

Addressed comments: fixed library name etc.

Addressed comments: moved AUTHORS etc. around, added README.md where approptiate.