Craig - edit docs
Craig - merge in master
Craig - update docs