Feature/i bem row

Resolve #39 , #40 , #28