Update README.
Update tests.
Merge branch 'master' into travis-osx