Fix #72
Merge remote-tracking branch 'origin/master' into queue-events

Conflicts:
	test/test.js
Lint fix.
Lint fixes and dead code removal.
Merge pull request #76 from krux/queue-events

Fix #72