now using sys.exit() instead of exit() (compat)
Merge branch 'master' into release