merge stuff

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>