Merge pull request #47 from onkar-dhuri/2.2

Code Refactorization -