base up...
merge branch 'master' of https://github.com/fbkarsdorp/tmi
add logging of queries
fix merge