Datepicker issue Fixed #57