Updated to proper jsDoc style
Merge branch 'different-docs'