Merge pull request #1 from getlantern/master

Master