better support for handheld devices
updated commit id