first step to moving database to DI
Merge branch 'release/0.2.4'