Docblock cleanup
Merge pull request #195 from redaxmedia/develop

Docblock cleanup