Applying tutorial changes to master