Menyelesaikan issue #51
Merge branch 'entry-script' into develop