merged
	https://github.com/andreasdr/tdme/commit/5bc18cf1ccfec4e213d6b56efda70f99fb7f881a