merged files

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>