Changes to the Exit class
Merge origin/master