wip
wip 1030
Merge remote-tracking branch 'yamanishi/master' into test_merge