Merge pull request #39 from BFALacerda/hydro-devel

code cleaning and small bug fix
Merge pull request #40 from BFALacerda/hydro-devel

handling 'Unknown' final nodes in nav stats