Version 2
Merge branch 'master' of https://github.com/BingHongLi/iiiProject