Update develop with latest code

Small repair. I kind of broke the branching model