Adding more things to detect, update readme.
Merge branch 'master' into gh-pages