Started working on picking up keys
Merge branch 'developer' of https://github.com/AndroidSquad/Coloristance into developer