WIP
Merge branch 'master' of github.com:tangrammer/wrapper

Conflicts:
	src/wrapper/core.clj