some clean ups and data set changes
added sonar dataset
Merge pull request #2609 from karlnapf/develop

Develop