Merge pull request #31 from HollyDAI/2C

Merge pull request #24 from HollyDAI/2c
Merge branch 'master' of local repository into 2C