fix
Merge branch 'dev' into datasource
issue #188