Wait might actually work now - for real this time.
Merge branch 'master' of github.com:iamhj/HEROES