Fix build
Merge branch 'develop' of github.com:robotbrain/fabricator into develop