Merge pull request #48 from nanliu/tb/lint