merged
	https://github.com/andreasdr/tdme/commit/35490a906e078ab84fa20604c75a66ca7e143eef
	https://github.com/andreasdr/tdme/commit/31016214c4a68a72b4177a953892f76556049f71