Merge pull request #148 from johnhroch/main