2014/10/02の問題を修正
Merge branch 'master' into ensyu