Final tweaks for #6, update README to document new features

Would you like me to squash & rebase?