Merge pull request #26 from xiaobaicoding/master

add new functions
Merge remote-tracking branch 'upstream/master'