almost final version
Merge branch 'master' of https://github.com/cho3ek/UI