Remerging branch after fixing bugs #2

Closed TheBestAstroNOT closed 1 month ago