modifications to be merged on python-oceans