It's 2014!
Merge pull request #3 from piotr-cz/patch_docblocks-2014

Updating docblocks to 2014