Removed some unnecessary stuff.
Merge branch 'master' into gh-pages