Added unit management
Merge branch 'develop'