Attempting to smoothly merge LoS from LoSA.
Merge pull request #13 from TheDizzler/Wonho

Attempting to smoothly merge LoS from LoSA.