Fixing stuff
Update documentation
Merge branch 'gh-pages'