CRA-534: Fixed some small bugs and merged with nrlib.
Merge pull request #54 from gudmund-hermansen/master

CRA-534: Fixed some small bugs and merged with nrlib.