ERT-757: Minor reorg to support windows build
Merge pull request #625 from joakim-hove/ERT-757-fixup

ERT-757: Minor reorg to support windows build
ERT-757 - Changed division by zero check to increase platform compatibility
Merge pull request #626 from jepebe/ERT-757

ERT-757 - Changed division by zero check to increase platform compatibility