Updated doc blocks
Merge pull request #27 from jakeasmith/docblock-fixes

Updated doc blocks