Merge pull request #362 from ndawe/master

fix convert_color