doc block corrections
correct return types in doc blocks
Merge pull request #1401 from dereuromark/master

CS fixes