Fix for #90 + Small JSDoc changes