Fixed script to run on any db
Weird....
Merge branch 'beta'