Merge pull request #24 from Magenic/master

Merge from main.
Fixed compile error in tests.
Merge pull request #95 from Bowman74/master

Fixed compile error