several fix
several bugfix
Merge remote-tracking branch 'konoha/master'