Fixed issue when using multiple emitters. Bumped to v0.3.1
Merge branch 'master' into gh-pages