Fixed some yardoc syntax
Merge branch 'v2.3.2'
Fixed yardoc comments