Fix Issue#48
Merge pull request #50 from yamanetoshi/Issue#48

Fix Issue#48