add by limingf 20141011
Merge pull request #2 from limingf/master

add by limingf 20141011