#227 Add logging