Minor changes towards the data set intersection part
Merge branch 'master' of github.com:soarlab/maline
Merged after a conflict