Updated version number
Encapsulated Input keys
Merge