v2.6.0
Merge pull request #319 from zhiyelee/v2.6.0

v2.6.0