Add logging
Merge branch 'feature/logging'