DEVIDM-80: Logging changes, some refactoring..
Merge pull request #72 from tomma/DEVIDM-80

DEVIDM-80: Logging changes, some refactoring..