Updated xombrero via upstream example