Unified docblocks
Merge pull request #35 from norzechowicz/docblocks

Unified docblocks