Fixed a link
Consolidated content in example section
Merge pull request #233 from TekHus/master

Various fixes and consolidation