Merge branch 'master' into tutorial
chmod 644