readme updated
Merge branch 'master' into more-colors