Merge pull request #4 from hairizalman/master

Merge pull request #27 from dianaismail/master
Merge pull request #29 from dianaismail/master

Merge pull request #4 from hairizalman/master