improved arrival and departure time logic Fixes #39
improved arrival and departure time logic Fixes #39