issue #19 - first real kiosk version