Merge pull request #168 from teshi04/master

Fixed #165
Fixed #166