Merge pull request #1 from qlonik/master

Merge Harvey branch with jsdoc into Eason master