Making master branch the same as the duet branch.
Tidying master branch.