DbFactory part 2
Merge pull request #6 from svenne87/master

DbFactory part 2