Merge pull request #37 from Magenic/master

Merge from main.
Merge pull request #149 from jwendl/master

Fixing issues.
Merge pull request #150 from Bowman74/master

Merge pull request #37 from Magenic/master
Merge pull request #41 from Magenic/master

Grabbing latest revision