Merge pull request for v1.1

Merge pull request for v1.1