issue G#88 - Fix Docblock issues