Fixed or improved emitter
Merge branch 'master' of github.com:pannous/english-script