db関数を更新。（呼び出し側で　$db = db(); を実行）
Merge remote-tracking branch 'origin/master' into sakamoto