Logging

Merged Finbar Ó Deaghaidh requested to merge logging into master