Added a bit to the readme
Merge branch 'master' into refactor