Merge pull request #7 from HypatiaStation/master

Merge with main branch
Fixes #196
Merge pull request #201 from nullquery/master

Merge with nullquery branch