added insert and remove lifecyle, fixed recusive include in if, added altr-raw tag
0.3.1