update by 03/23
Merge branch 'master' of https://github.com/Choonster/AMS