Changed readme.
Changed code style.
Merge branch 'develop'