fixing
db fix
Merge branch 'master' of github.com:correlator/NBShaker