Merge pull request #1 from liuml07/master

Add some trivial modifications to make it better
Add error checking for invalid vehicle number
Remove \t in blank lines