revise till 1.17
Merge branch 'master' of github.com:szhang90/MUS302