Fix #90 + Small JSDoc changes