Make carrier optional, driven by argument to constructor, not a #define. Fix starting on a space. Add a carrier example.