Merge pull request #159 from g3dut1s/master

Update year. Change title for file DocBlock.
Merge pull request #160 from g3dut1s/master

Fixes & Cleanups