Merge pull request #90 from irshad89/master

fix kewpa13
Merge pull request #91 from irshad89/master

kewpa2
Merge pull request #92 from irshad89/master

kewpa2 & 14
kewpa6