Merge pull request #38 from dolob-mrmr/master

updating branch in github from master
Merge pull request #39 from dolob-mrmr/hamzah

Merge pull request #38 from dolob-mrmr/master