Fixed bad event and early exit
Release 2.0.1
Merge remote-tracking branch 'origin/master' into dev/update.readme