Merge pull request #6 from jdmielke/master

Jon's I2 stuff
Add null check for add/remove truck
Merge pull request #14 from aguibert/master

maybe