Text tweaks
Fixed directory link.
Merged with the master branch.
Merged with the gh-pages and fixed a link.