Skip to content

Improve exit logic

Improve exit logic #77