Updated docs, fix for #168

Sorry for putting so much in here. I forgot to submit the doc merge.