I have fixed the Naff Demo so it exits to the desktop properly.