Fixed some docblocks
Merge remote-tracking branch 'origin/1.0'