Introduce rerite engine
Merge branch master