Merge pull request #1 from afifsohaili/develop

Initial commit