Update README.md
Fixes issue #80
Merge branch 'master' into gh-pages