enhanced macro support
Merge branch 'master' of github.com:hotwolf/HSW12