Don't wait before sending if not necessary. Closes #34