[Issue #210] D O N E. Except I have to do some code cleanup.
[Issue #210] D O N E. Except I have to do some code cleanup.

Valenchak/lightbeam,mozilla/lightbeam,mozilla/lightbeam,Valenchak/lightbeam,Valenchak/lightbeam,mozilla/lightbeam