This is yongfeng zhong's commitment
Merge branch 'master' of https://github.com/alplecture2014/alp2014.git