Time Issue Fixed fixed #64 fixed #65