Fix some issues.
fixed
Merge pull request #4 from ra1028/master

fix