Merge pull request #34 from dolob-mrmr/master

111014
Merge pull request #35 from dolob-mrmr/hamzah

Merge pull request #34 from dolob-mrmr/master