Fixes several bugs in crud
Merge branch 'origin/master'