minor changes
Merge branch 'master' of https://github.com/TheDizzler/LoS into Wonho
Merge branch 'master' into Wonho