fixed cell insertion,
minor improvement on wrapper
Merge branch 'dev'