Merge pull request #87 from colearendt/fix-ci