Adding kndle + maps
Merge branch 'master' of ssh://github.com/ab10anand/Chronos