upd
Merge branch 'master' of github.com:ernado/gotok