updating develop to latest #116

Closed bvilhjal closed 4 years ago