Clean database
Merge branch 'master' into wojtek