Two in one

Merge branch into master