Merge pull request #35 from akutz/feature/wait-on-network

Wait on network