Merge "Initialise variables and update documentation"