hisotry refactor; +upd
Merge branch 'master' of https://github.com/cybern223/kinoost