Merge branch 'master' of https://github.com/Niktux/factory