fix
fix some issues
fix some issues
fix some issues
Merge pull request #6 from ra1028/master

Maybe all issues fixed.