commit
Merge https://github.com/Micheal-Bigmac/Common-Manager