commit 2
Merge pull request #1 from cahayaonline/master

commit 2