issue #260
Merge pull request #267 from great-h/furu/issue-260

please review