Fix control flow issue.
Added vehicle support.
Merge pull request #2 from HmmmQuestionMark/master

Vehicle support.