Better message logging [fix #17]