close #98
Merge branch 'trunk' of github.com:RGLab/flowWorkspace into trunk