Strip whitespace.
Update README.
Merge branch 'develop'