Merge pull request #1 from leofen/master

fix bugs