Refine the giri flow graph
Merge branch 'dev' of github.com:liuml07/giri into dev