* fixed #16
* fixed db