I've added fixes for the comments above, and rebased the branch. Adding pullrequest tag again for more testing.
I've added fixes for the comments above, and rebased the branch. Adding pullrequest tag again for more testing.