Good catch. I will update the commit with all the required changes..