Apply feedbacks to ch4 (Thanks to @tacahiroy):

For details, see the following gist:
https://gist.github.com/yasulab/ca0f825ec4f9d0e74b9c