Merge pull request #2 from amphineko/dev-main