@ashorin - I will do changes and update it. 
Does this require reopen new pull request or push to this current one ?