Merge develop

Correct namespaces for class Cars.