(merge) 	Branch 'kayellpeee-documentation/updateSetup'