Add phpdoc and bugfix, CCC-83