Merge branch 'hotfix'
mods on readme
Merge branch 'htfix' into develop