Merge pull request #38 from BFALacerda/hydro-devel

getting prism to compile
code cleaning and small bug fix