ready to merge
Merge branch 'rewrite-4'