Merge pull request #1 from rive04-11-2/develop

Develop test
Merge pull request #2 from rive04-11-2/develop

finished test
test3
commit demo fork
Merge remote-tracking branch 'upstream/develop' into develop