kaniini Merge pull request #39 from KellerFuchs/ci