use full path to data dir
Merge branch 'release/0.2'