New and updated files
Fix to the rewrite file
Merge branch 'master' into tutorial