RGLab/flowViz#26
Merge branch 'trunk'