Merge pull request #1 from HypatiaStation/master

Resync with main code