Dev to Master

Included the first adaptations of Koen