Merge pull request #1 from syahrizal1/master

Merge pull request #1 from ilhammps/master
Merge pull request #2 from ilhammps/master

Merge pull request #1 from syahrizal1/master