Added a bit to the readme and fixed a bug
Merge branch 'master' into custom