Merging with develop

We want to keep synced the EPFL DATA branch to the develop branch.