Adding JSDoc
Some refactorization
Merge pull request #1 from nohira/development

Merge from development