Fixed manager
Merge branch 'master' of https://github.com/glic3rinu/orchestra-orm