add support for keyboard option
Merge pull request #319 from falexandrou/add-keyboard-option

add support for keyboard option