Merge branch 'master' of https://github.com/ikkitousen/yoi
Added some (db-disconnection) for safety.
Merge