README fix
Merged stuff from github