added some color to warning, update readme
Merge branch 'master' into gh-pages