Patch pushed as d6824f6de42f036d293844e049add0650045249a with a few
modifications.
Thanks.