Merge pull request #9 from hairizalman/master

Merge pull request #34 from dianaismail/master
update again
Merge pull request #35 from dianaismail/master

update controller ptra