merged https://github.com/andreasdr/tdme/commit/7c77f7254b1b225a1fc41609521139b554ddf972