Merge pull request #1 from Rebilly/master

Merge PR
Add docblock and const
Add const and docblock
small comments fix
Merge pull request #6 from dara123/master

Use const and Add docblock