updated docblock
remove includes so as to rely on the new autoloader
Merge upstream