Merge pull request #38 from houkanshan/master

再修最后一次
fix bugs
fix pop, fix radius