Merge pull request #21 from HollyDAI/master

2C