fajran Merge pull request #5 from melvinodsa/master