Added handling of colours + added log
Merged feat-GF-Colours with Master

that^