Bugfix: Strict standards and phpdocs