Merged directory docs
Fixed tags
Merge pull request #224 from TekHus/master

Fixed directory doc
Merge pull request #717 from KevWright/master

Fixed directory doc