Create data folder when folder does not exist
Merge branch 'release/v2.0.2'