Resolve minor issues from last commits
make CI build faster
Merge pull request #23 from PeterDaveHello/patch-1

make CI build faster