More merging in the guide
Merge pull request #196 from TekHus/master

More merging in the guide
Merge pull request #684 from KevWright/master

More merging in the guide