Wrong branch for subtraction mode
Merge branch 'master' into gh-pages