Merge pull request #2 from martinvandriel/master

 - Celso's corrections
Merge pull request #3 from martinvandriel/master

 - idom_fluid is not a logical, caused runtime error on cray
Merge remote-tracking branch 'upstream/master'
 - did not make so much sense that everybody writes into the same file at the same time