Reformatted string as planned.
Changed README
Merge origin/master