Merge pull request #26 from isao/develop

prep v0.0.4