Merge pull request #4 from amphineko/dev-main