Merge pull request #133 from irshad89/master

kewpa28,30
kewpa29,31