A few adjustments have been made including PHPDoc blocks and inline documentation.
Merge remote-tracking branch 'origin/master'