Merge with local repository

Signed-off-by: Lars Randers <lranders@mail.dk>