Fixed bug in positioning of values in CSV and added hydrofilename to out...

...put.

Partially resolves issue #84