D-Cordoba

@tobinfiedler this issue is already been solved in my branch. And will be next week along with @DaJansenGit reviewed, in order to afterwards merge it on development.