Merge pull request #1 from bcit-ci/develop

Merge main repo