Fixed merge conflicts from 'mikes-functions' and 'master' merge