Merge pull request #10 from getlantern/roundrobin

Roundrobin
Merge branch 'master' into roundrobin