Automatically wrap user code, simplify wrapper
Merge branch 'master' of github.com:jtwb/isocode-marionette