Some modifications
Merge remote-tracking branch 'origin/watabe_modification' into dev