Bootstrap database method
Fix
Merge branch 'tcivera-master'
Fix