Merge pull request #4 from hairizalman/master

Merge pull request #27 from dianaismail/master