More phpDoc stuff

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #915 from Oldiesmann/release-2.1

More phpDoc stuff