Fixed database cleanup routine
Version bump
Merge from master