modification for #504
Merge pull request #98 from yohno/master

modification for #504