Merge pull request #1848 from antonio-nino-diaz-arm/an/docs

Minor changes to documentation and comments