Merge pull request #103 from snufkin/main-stable