Merge pull request #2 from fahmillah/erik

Erik
Merge pull request #4 from fahmillah/master

Merge pull request #2 from fahmillah/erik