issue #178
Merge branch 'dev' into datasource