Added callback-wrapping feature
Merge branch 'callback-wrapping' into new-features

Conflicts:
	README.md