Cosmetics.
Updated README
Merge branch 'master' into devel