changes to library/keyboard
merging