pull request dianaismail/myspata

merge code hairizalman/myspata with dianaismail/myspata