Release 2.1
Merge pull request #44 from Cangjians/2.x

Release 2.1