fix
Merge branch 'dev' of https://github.com/skatkatt/tg into dev