Fixes the issue #218
Merge pull request #220 from azisaka/master

Fixes the issue #218