Merge pull request #947 from davidcunado-arm/dc/update_userguide