Merge "Update userguide"