Fixed factory
Merge branch 'master' of https://github.com/funnythingz/qflipper