Issue G#88 Fix Docblock issues

part 2
Issue G#88 Fix Docblock issues

part 3
Merge pull request #108 from Sajaki/v130

parts 2 & 3 to fix issue 88.