Fix CI

Fixes #1
Fixes #2
Merge pull request #3 from fromonesrc/master

Fix CI