Add logging
Merge branch 'f/add-logging' into develop