fixed some bugs
Merge remote-tracking branch 'tomotaro1065/master'