You're right. 2nd commit has included what you suggested. I'll merge them together if travis pass.