More options and better behaviour when re-run
Bump to version 1