Adjust: #388
Adjust: #389
Adjust: #390
Adjust: #391
Merge pull request #392 from otiai10/ws/adjust-update

adjust to update