Extract more info
Merge branch 'master' of github.com:exbluesbreaker/csu-code-analysis