Make custom emitter work
Merge pull request #990 from skumargithub/master

Make custom emitter work