Fix rewrite 2.0. Close #3
Merge branch 'feature-3'

* feature-3:
  Fix rewrite 2.0. Close #3