Solved the issue of exit being is history, see issue #59