better support for different kinds of flask apps
Merge remote-tracking branch 'origin/master'