Fix minor flow issue
Merge pull request #133 from ooeygui/develop

Fix minor flow issue