Merge pull request #1617 from vlakoff/doc

Some adjustments in inline documentation