Update Readme
Ballancing and refactoring
Merge branch 'master' into gh-pages