Fixes #3 Fixing bug in FabriqModelItem
Fixing merge conflicts
Merged in changes from 2.2.1