Reverting previous commit
Merge remote-tracking branch 'upstream/master'
Fixed typos, phpdoc and some unused imports
Reverting the revert :/ (I need to learn how to use git properly)
Merge pull request #683 from mnapoli/PhpDoc

Fixed typos, phpdoc and some unused imports