improved humans manager
Merge branch 'dev'