Merge pull request #15 from zflat/cleaner-db

Cleaner db