Bug fix, waiting for services now.
Merge pull request #11 from cdondrup/master

Bug fix, waiting for services now.