change to 2.0
modify
Merge pull request #1 from aloysious/master

Auto merge by kpm server