Updated documentation: Integration of Timo's part