nao usarsim fixes
Merge branch 'hydro-devel' of https://github.com/ecervera/rpn into hydro-devel