Merge pull request #4 from isao/develop

refactor with tap/istanbul test coverage