Fixes issue #318 and #313

This is just an update on how the docs given that there are a lot of repeated questions in the discussion lists and issues posted on the repo.