phpDoc & small refactor
Merge pull request #1 from jamek/master

phpDoc & small refactor