Added more documentation to the README
Merge branch 'master' into tests