merged https://github.com/andreasdr/tdme/commit/178146625cfd95a6b9d9d49b0acc169c0a0d5a96