merge changes
Merge branch 'v1.0.0' of github.com:ray-sourceguru/test-merge into v1.0.0