Fixed batch processing
Merge branch 'master' of ssh://github.com/CityTransit/Soderberg
Fixed makefile