changes for v0.6.1
Merge pull request #1154 from isao/rel0.6.1

changes for v0.6.1
release 0.6.1 (based on 0.6.0-45-g6700e22)