Some descriprion changes
Fixed PHPDoc
Added UnitTest