Merge pull request #9 from a2lin/fixed_bug

wtf
fixed
Merge pull request #10 from a2lin/fixed_bug

fixed
fixed