Cleanup dikit biar lebih ringkas
Merge branch 'master' of https://github.com/bluearth/orca2.git