Fix DocBlocks

I started this to solve Issue #17. Because I did not find a solution, the 2 DocBlock changes are the only changes I made.