Adapter added
Merge branch 'master' into without_peer_deps

Conflicts:
	index.js
	package.json