[FIX] issue #118
Merge branch 'feature-dbt' into develop