Fixed almost everything
Merge branch 'master' into gh-pages