Minor enhancements + make run with current tink_macro.
Merge branch 'master' of https://github.com/haxetink/tink_template