getlantern/lantern — pull request #1800 by oxtoacart (2014-09-09 17:13:40+00:00)
Title: Closes #1795, #1797, #1798 and #1799

Closes #1795, #1797, #1798 and #1799