removed dead code; fixed phpdoc
Merge pull request #168 from fprochazka/patch-2

Removed dead code; fixed phpdoc