Add SLIM scanner
Merge remote-tracking branch 'jurrick/master'