GH155 - cleanup
Merge branch 'master' of https://github.com/flower-platform/main.git