Moved the exit
Merge pull request #273 from Lerogero/master

Moved the exit