fixes #1

Some PHPDoc fixes + fixes bug #1