Merge pull request #2 from wnowak/hydro-devel

fixes for cmake, error messages and python
temporary fix in sample program
Merge remote-tracking branch 'upstream/hydro-devel' into hydro-devel