Make sure the live server blocks until it's available
Merge pull request #66 from traumtopf/master

Make sure the live server blocks until it's available