I have attached the same patch with one more test; rebased to master.

On Fri, Jun 9, 2017 at 12:59 PM Kaushal Modi <kaushal.modi@gmail.com> wrote:
I have attached the updated patch, rebased to master.
--

Kaushal Modi