fixed jsdoc notation (return type wasn't specified correctly)
Merge remote-tracking branch 'origin/master'