Newsetupmerge

@adriano-maljkovic It's probably time to merge this branch into master. Should I go ahead with that?