Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Error bug fixing. Readme file updated
Merge branch 'gh-pages'