Merge branch 'Main' of https://github.com/Ricain/stcal into Main