big refactoring
Merge branch 'master' of github.com:pj4533/lightman