updated version
Merge tag '0.36.0'
rebased to color 0.3