Merge pull request #20 from isao/develop

minor: add tests & comments