Fixed Previous Date Issue.
Fixed Vechicle Type Issue.
Merge origin/master