Extra logging
Merge branch 'extra-logging' into gitter