Merge pull request #59 from HollyDAI/master

20140514 16:52
Merge pull request #60 from HollyDAI/2c

Merge pull request #59 from HollyDAI/master