allow specifying colours in either HSV or RGB space
Merge branch 'master' into python2