Merge pull request #200 from TinyAllen/fix/lint

Update: fix the CI issues