Fixed 'number'
Fixed 'number'
Added color support