exit with correct return code
Merge branch 'return-code'

* return-code:
  exit with correct return code