Improve manual, add Car example
Fix conflict