Merge pull request #19 from mxlan/vehicle_refactor_2014