laptop sync
Merge branch 'master' of https://github.com/noisybit/KMA
Merge branch 'master' of https://github.com/noisybit/KMA