Updated version of develop branch of nansencenter/openwind