Added light on, and code refactoring
Merge branch 'master' of github.com:Konosprod/pyTrivia