Merge pull request #16 from Magenic/master

Merge pull request #49 from Bowman74/master
Merge pull request #17 from Magenic/master

Merge from Main
Merge pull request #18 from Magenic/master

Merge from Main
Merge pull request #19 from Magenic/master

Merge from master
Fix compile errors.
Merge pull request #67 from Bowman74/master

Fix compile errors.
Merge pull request #19 from Magenic/master

Bringing changes from main fork.