Updated and extended the Color class