Merge easysetup branch into master