Merge pull request #73 from nanliu/tb/logoutput