Added a /data folder
Merge branch 'release/0.2'