Merge pull request #19 from isao/develop

fix test, minor edits