Merge pull request #58 from vikasmathod/dev

changes lgtm
Merge pull request #1 from acharyarajiv/dev

code refactory
Merge pull request #59 from vikasmathod/dev

lgtm