detail
Merge branch 'master' of https://github.com/annaptak/mka2.0