merge
merge
merge
Merge pull request #5 from Dilshani/master

adding changes
activate method changes