regexp
jsdoc fixed
Merge pull request #201 from attiks/181-code-clean-up

181 code clean up and jsdoc parameter type
Merge remote-tracking branch 'upstream/dev' into dev