added exit()
Merge branch 'tobi' into development