added JSDoc and some JSDoc markup
Merge branch 'dev'