fix bugs
fix bugs
Merge pull request #36 from canard0328/issues/#35

Issues/#35