Cleaning up stuff
Merge branch 'master' into presentation