Merge pull request #20 from AlectaInfo/master

Merging Bhagya
Merge pull request #21 from AlectaInfo/bhagi

Merge pull request #20 from AlectaInfo/master