fix docblock
Merge branch 'develop'