Merge pull request #1 from dvrylc/dev

Merge dev into master
Updated tg
Merge pull request #2 from dvrylc/tg-update

Updated tg submodule