@christianv - I have made the changes and updated the PR