Addressed #8, make few more changes. Attached patch, interdiff and after patc...