Merge pull request #4 from isao/develop

sync various minor updates