DBMovie almost done - still needs testing
Merge remote-tracking branch 'origin/master'