Merge pull request !2 from chenyuepan/master-develop
Merge pull request !1 from chenyuepan/master-algorithm