2014-12-07
Merge pull request #1 from YaluYou/master

Merge pull request #1 from angelvan2012/master
Merge pull request #2 from angelvan2012/master

merge from anqi