Improve detected symbols
Merge remote-tracking branch 'MSch/master'