Staff management done.
Merge origin/master