Update manager service
Merge pull request #564 from pokap/fix_manager

Update manager service