Merge pull request #8 from HypatiaStation/master

Merge with main branch
Fixes #211
Merge pull request #212 from nullquery/master

Merge with nullquery branch