use new matcher
bug fixes for last commit
Merge branch 'master' into development

Conflicts:
	shell-execute.coffee
version bump