Merged dev branch

Signed-off-by: Wouter Vervloet <wouter@baseworks.nl>