Merged new pull requestes

Refer to CHANGELOG.md