#1016 Updated, restructured users guide