Merge tag 'v0.9' into develop

v0.9.0
Merge pull request #66 from psichi/master

Merge back
Merge branch 'develop' of ssh://github.com/psichi/chix-flow into develop
Merge pull request #67 from psichi/develop

Develop