Merge pull request #1 from K-16/dev

v2.25
Merge pull request #2 from K-16/gen

Merge pull request #1 from K-16/dev