Secretary working
Update
Merge master