Merge pull request #339 from MoritakaSoma/master

Fixed issue #335