Adding exit parameter as per issue 106