Issue #4 : Timezone issue fixed