Fix some problem
Merge pull request #10 from yamanetoshi/fixFirstBug

Fix some problem