Merge branch 'master' into insert
Merge branch 'master' into insert
make sure id is not removed upon insert
remove function
tests for insert and remove functions
Merge branch 'insert'