Thanks for the feedback. I'll fix this branch, and create a new PR for 1.x-master