Merge branch 'v0.4'
Merge branch 'master' of https://github.com/Desertsnowman/DB-Toolkit