update readme
fix typo in tests
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	README.md
Merge branch 'develop' into feature/access_methods