Hack in a global wait/no-wait flag.
Release 0.5
Bump to 0.5-dev