Fixing docblock errors
Merge branch 'techdivision'
Merge pull request #33 from wagnert/master

Fixing docblock errors