Merge branch 'gh-pages'
Added and fixed problems
Merge branch 'master' into gh-pages