issue G#88 - Fix Docblock issues
Merge branch 'develop' into v130
Merge pull request #107 from Sajaki/v130

V130 merge #88 fix