Merge pull request #46 from qkhj/master

add