added shot colour handling
merged