Work on scanner
Merge branch 'master' of github.com:gilchenzion/chil-plt