Merge pull request #39 from Manarabdelaty/fix_ci

CI updates to get it passing