fixed
12/8/02:09
2014/12/9/19/57
Merge branch 'yoshimasa'