move cache to interface
Merge remote-tracking branch 'upstream/develop' into develop
refactor merge method
Merge remote-tracking branch 'upstream/develop' into develop
update readme
fix typo in tests
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	README.md