'Merge' branch laptop into master
misc changes
Merge branch 'master' into desktop