karthik | MS-223 | refactored the code.
Merge branch 'MS223' into version-1.01