Merge branches 'live' and 'master'
Removing printouts
Merge branch 'master' into live