Open gms1 opened 2 months ago
Fixes #88 #87
rebased to resolve merge conflicts
@omrikiei Is there anything else that needs to be done or can it be merged?
Fixes #88 #87