Update documentation
Fixing import errors.
Update documentation
Merge branch 'gh-pages'