bugfix
Merge pull request #54 from xudafeng/master

Auto merge by kpm server