...
Merge pull request #6 from gaffa/ensure_running

...