commit 3
Merge pull request #2 from cahayaonline/master

commit 3