Bug fixes
Merge branch 'dev' of https://github.com/DrKLO/Telegram